merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Nov 2006 17:37:36 +0000 (10:37 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Nov 2006 17:37:36 +0000 (10:37 -0700)

Trivial merge